Silence automake warnings

When commenting out a binary, also comment out the related variables.
Don't include Makefile.decl in gtk-doc Makefile.am's as they disagree
on assigning to EXTRA_DIST.

diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index f8441217c33b1ffa811d77089bc8fef28a0a01ba..6eeffdb0d76310b32015fec360e0d535df884f04 100644 (file)
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
 
 AUTOMAKE_OPTIONS = 1.6
 

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index f0bd152eb4885a2333ad051e20ec1b52df274fb5..9389c0413afa041eed927ae8d10a38df112046ac 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
 
 AUTOMAKE_OPTIONS = 1.6
 

diff --git a/docs/reference/libgail-util/Makefile.am b/docs/reference/libgail-util/Makefile.am
index cfd0f688d0e94e1dadbe11e41d3fc4590429e5fa..ee583e1753d1d5ca679b19531d10ca516a410041 100644 (file)
--- a/docs/reference/libgail-util/Makefile.am
+++ b/docs/reference/libgail-util/Makefile.am
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
 
 AUTOMAKE_OPTIONS = 1.7
 

diff --git a/gdk/tests/Makefile.am b/gdk/tests/Makefile.am
index e23df125572e3c97fa4cf9be6165bee8bb4c1d9e..5930f4ca33e2a6bb8fcca145e3e9e95ee9e28a6a 100644 (file)
--- a/gdk/tests/Makefile.am
+++ b/gdk/tests/Makefile.am
@@ -16,8 +16,8 @@ progs_ldadd = \
        $(NULL)
 
 #TEST_PROGS              += check-gdk-cairo
-check_gdk_cairo_SOURCES  = check-gdk-cairo.c
-check_gdk_cairo_LDADD    = $(progs_ldadd)
+#check_gdk_cairo_SOURCES  = check-gdk-cairo.c
+#check_gdk_cairo_LDADD    = $(progs_ldadd)
 
 TEST_PROGS        += gdk-color
 gdk_color_SOURCES  = gdk-color.c

diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index 34367ee4dbaa2922aeef03b78fbb0865ec88f206..994d7161467ec9d0be197e6219165d5e917650a2 100644 (file)
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -57,8 +57,8 @@ floating_LDADD                         = $(progs_ldadd)
 # on a naked X server creates slightly different event
 # sequences than running on a normal desktop
 # TEST_PROGS                   += crossingevents
-crossingevents_SOURCES          = crossingevents.c
-crossingevents_LDADD            = $(progs_ldadd)
+#crossingevents_SOURCES                 = crossingevents.c
+#crossingevents_LDADD           = $(progs_ldadd)
 
 # Should be ported to new API's
 #TEST_PROGS                    += filechooser
@@ -72,9 +72,9 @@ builder_LDFLAGS                        = -export-dynamic
 
 if OS_UNIX
 #TEST_PROGS                    += defaultvalue
+#defaultvalue_SOURCES           = defaultvalue.c pixbuf-init.c
+#defaultvalue_LDADD             = $(progs_ldadd)
 endif
-defaultvalue_SOURCES            = defaultvalue.c pixbuf-init.c
-defaultvalue_LDADD              = $(progs_ldadd)
 
 TEST_PROGS                     += textbuffer
 textbuffer_SOURCES              = textbuffer.c pixbuf-init.c